From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Sun, 16 Feb 2014 06:06:53 +0000 (-0800)
Subject: appDisplay: don't force size on folder icon actor
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2774
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f959cafb36a43ea3ea17e3f704d58d65e1917ee5;p=gnome-shell.git

appDisplay: don't force size on folder icon actor

Use a table layout instead.

https://bugzilla.gnome.org/show_bug.cgi?id=705410
---

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index e2db974b3..7d37798e2 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -924,9 +924,9 @@ const FolderView = new Lang.Class({
     },
 
     createFolderIcon: function(size) {
-        let icon = new St.Widget({ layout_manager: new Clutter.BinLayout(),
-                                   style_class: 'app-folder-icon',
-                                   width: size, height: size });
+        let layout = new Clutter.TableLayout();
+        let icon = new St.Widget({ layout_manager: layout,
+                                   style_class: 'app-folder-icon' });
         let subSize = Math.floor(FOLDER_SUBICON_FRACTION * size);
 
         let aligns = [ Clutter.ActorAlign.START, Clutter.ActorAlign.END ];
@@ -936,7 +936,7 @@ const FolderView = new Lang.Class({
                                    x_expand: true, y_expand: true });
             bin.set_x_align(aligns[i % 2]);
             bin.set_y_align(aligns[Math.floor(i / 2)]);
-            icon.add_actor(bin);
+            layout.pack(bin, i % 2, Math.floor(i / 2));
         }
 
         return icon;